From: Kelvin White <kelvin.white77@gmail.com>
Date: Thu, 19 Jun 2014 17:00:00 +0000 (-0400)
Subject: Merge commit for debbugs:17755
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3423^2~1409^2~60
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f104d279f5793a2d850f4d57944452e649d7f1ac;p=emacs.git

Merge commit for debbugs:17755
---

f104d279f5793a2d850f4d57944452e649d7f1ac